Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 10 Jun 2010 11:34:20 +0000 (11:34 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 10 Jun 2010 11:34:20 +0000 (11:34 +0000)
commitcae42dc5f32aaaae329e2875ed0ef0165727068b
treea9e9bde4e80f2ab45b2d9ca7c97a090563f32834
parent75ed815735593d433cba64f92791f94ef7ec16f4
parentfc412252d81c7c0a7e6ccf777c4bd0220c1e72c9
Merge from mainline.